Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 28 Jan 2010 08:56:33 +0000 (08:56 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 28 Jan 2010 08:56:33 +0000 (08:56 +0000)

Trivial merge